Prefer X11 to Carbon only when some X-specific

option is specified (Thanks to Jan Dj� and Andreas Schwab).

diff --git a/configure.in b/configure.in
index 10e843d2a26b962a3e2da11af27b268d4973a07c..871c0dac5e762e315f12a3c69ce202b5635221bd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1779,7 +1779,13 @@ fi
 if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
   if test "${with_carbon+set}" != set \
      && test "${carbon_appdir_x+set}" != set; then
-    HAVE_CARBON=no
+    for var in with_x with_x_toolkit with_gtk with_xim \
+               with_xpm with_jpeg with_tiff with_gif with_png; do
+      if eval test \"\${$var+set}\" = set; then
+        HAVE_CARBON=no
+        break
+      fi
+    done
   fi
 fi
 if test "${HAVE_CARBON}" = yes; then